From: Glenn Morris <rgm@gnu.org>
Date: Sat, 22 Aug 2009 19:47:42 +0000 (+0000)
Subject: (diary-mark-entries-1): Only mark all days of a given name if the
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~10953
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=eef3dda0058620c2eacfb7538882ddd84f87c09e;p=emacs.git

(diary-mark-entries-1): Only mark all days of a given name if the
pattern is not more specific.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce2c1463b29..cbd9f90e11e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-08-22  Glenn Morris  <rgm@gnu.org>
 
+	* calendar/diary-lib.el (diary-mark-entries-1): Only mark all days of a
+	given name if the pattern is not more specific.
+
 	* calendar/lunar.el (lunar-phase-names): New option.
 	(lunar-phase): Doc fix.
 	(lunar-cycles-per-year): New constant.
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 0081170d8ac..ac608517e0f 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -1246,7 +1246,9 @@ function that converts absolute dates to dates of the appropriate type.  "
                                (buffer-substring-no-properties
                                 (point) (line-end-position))
                                file-glob-attrs)))
-            (if dd-name
+            ;; Only mark all days of a given name if the pattern
+            ;; contains no more specific elements.
+            (if (and dd-name (not (or d-pos m-pos y-pos)))
                 (calendar-mark-days-named
                  (cdr (assoc-string dd-name
                                     (calendar-make-alist